f8a074ed2a68fcafb3e30d5e072700525d961ce2,opennms-model/src/main/java/org/opennms/netmgt/dao/jdbc/event/EventMappingQuery.java,EventMappingQuery,mapRow,#ResultSet#number#,91

Before Change


        OnmsAlarm alarm = (alarmId.intValue() == 0) ? null : (OnmsAlarm)Cache.obtain(OnmsAlarm.class, alarmId);
        event.setAlarm(alarm);
        
        Integer serviceId = new Integer(rs.getInt("serviceId"));
        OnmsMonitoredService service = (serviceId.intValue() == 0) ? null : (OnmsMonitoredService)Cache.obtain(OnmsMonitoredService.class, serviceId);
        event.setService(service);

After Change


        OnmsAlarm alarm = alarmId == null ? null : (OnmsAlarm)Cache.obtain(OnmsAlarm.class, alarmId);
        event.setAlarm(alarm);
        
        Integer serviceId = (Integer)rs.getObject("serviceId");
        OnmsServiceType service = (serviceId == null) ? null : (OnmsServiceType)Cache.obtain(OnmsServiceType.class, serviceId);
        event.setServiceType(service);